Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 17 Mar 2010 14:41:32 +0000 (14:41 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 17 Mar 2010 14:41:32 +0000 (14:41 +0000)

Trivial merge